projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70c7a51 e643977)
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 23 Mar 2016 18:24:28 +0000 (11:24 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 23 Mar 2016 18:24:28 +0000 (11:24 -0700)
e643977 Make `toggle-frame-maximized' respect the dock on OS X (bug#2...
38a43f1 Fix bug in displaying header line with a box face

1  2 
src/xdisp.c patch | diff1 | diff2 | blob | history

diff --cc src/xdisp.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.